From 5722f25d5135d1ae75709f1abe9e010b6aa0777b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 26 Aug 2017 18:01:17 -0400 Subject: [PATCH] x11: Fix initial drag cursors Under X, we were not setting the right drag cursor initially, because at current_action == action == 0, initially. Fix this by explicitly using the right cursor when grabbing. --- gdk/x11/gdkdnd-x11.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 6841d0ad83..dd2d280ea2 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -2668,6 +2668,7 @@ drag_context_grab (GdkDragContext *context) GdkWindow *root; GdkSeat *seat; gint keycode, i; + GdkCursor *cursor; if (!x11_context->ipc_window) return FALSE; @@ -2682,6 +2683,9 @@ drag_context_grab (GdkDragContext *context) #endif capabilities = GDK_SEAT_CAPABILITY_ALL; + cursor = gdk_drag_get_cursor (context, x11_context->current_action); + g_set_object (&x11_context->cursor, cursor); + if (gdk_seat_grab (seat, x11_context->ipc_window, capabilities, FALSE, x11_context->cursor, NULL, NULL, NULL) != GDK_GRAB_SUCCESS) -- 2.30.2